Merge branch 'master' of /home/wd/git/u-boot/work
authorWolfgang Denk <[email protected]>
Tue, 29 Jun 2010 21:03:47 +0000 (23:03 +0200)
committerWolfgang Denk <[email protected]>
Tue, 29 Jun 2010 21:03:47 +0000 (23:03 +0200)

Trivial merge